Merge branch 'master' into cleanup

author GPSBabel <gpsbabel@users.noreply.github.com>

Tue, 5 Dec 2017 05:35:01 +0000 (23:35 -0600)

committer GitHub <noreply@github.com>

Tue, 5 Dec 2017 05:35:01 +0000 (23:35 -0600)
author GPSBabel <gpsbabel@users.noreply.github.com>
Tue, 5 Dec 2017 05:35:01 +0000 (23:35 -0600)
committer GitHub <noreply@github.com>
Tue, 5 Dec 2017 05:35:01 +0000 (23:35 -0600)
diff --cc main.cc
Simple merge
diff --cc mtk_logger.cc
Simple merge
diff --cc raymarine.cc
Simple merge
diff --cc util.cc
Simple merge
diff --cc v900.cc
Simple merge
author	GPSBabel <gpsbabel@users.noreply.github.com>
	Tue, 5 Dec 2017 05:35:01 +0000 (23:35 -0600)
committer	GitHub <noreply@github.com>
	Tue, 5 Dec 2017 05:35:01 +0000 (23:35 -0600)
		1	2
main.cc	patch \|	diff1 \|	diff2 \|	blob \| history
mtk_logger.cc	patch \|	diff1 \|	diff2 \|	blob \| history
raymarine.cc	patch \|	diff1 \|	diff2 \|	blob \| history
util.cc	patch \|	diff1 \|	diff2 \|	blob \| history
v900.cc	patch \|	diff1 \|	diff2 \|	blob \| history